[CPU: Bugfix] fix the problem mentioned in #4454 #4552
Open
Sherlockzhangjinge wants to merge 3 commits into
Open
[CPU: Bugfix] fix the problem mentioned in #4454 #4552Sherlockzhangjinge wants to merge 3 commits into
Sherlockzhangjinge wants to merge 3 commits into
Conversation
…thWiseInt8AddBiasScaleUnit which causse the error below: 不能在初始化时将 const int32_t* const 转换为 const float* Signed-off-by: Jixingguang <1955992348@qq.com> Signed-off-by: Sherlockzhangjinge <zjgzhangjinge@outlook.com> Signed-off-by: lyd1992 <liuyudong@iscas.ac.cn>
Signed-off-by: Jixingguang <1955992348@qq.com> Signed-off-by: Sherlockzhangjinge <zjgzhangjinge@outlook.com> Signed-off-by: lyd1992 <liuyudong@iscas.ac.cn>
wangzhaode
reviewed
Jun 18, 2026
wangzhaode
reviewed
Jun 18, 2026
Collaborator
|
There are unresolved merge conflict markers left in the diff:
Please resolve these conflicts and force-push again. The code won't compile as-is. |
Signed-off-by: Jixingguang <1955992348@qq.com> Signed-off-by: Sherlockzhangjinge <zjgzhangjinge@outlook.com> Signed-off-by: lyd1992 <liuyudong@iscas.ac.cn>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
complete the PR that is closed in #4454
I have rebased this PR onto the latest master and resolved the merge conflicts caused by the changes already merged through #4359.
Specifically:
Kept both #include <sys/types.h> (from master) and #include "Int8FunctionsOpt.h" as suggested.
Preserved the bias_z fix by changing its type from const float* to const int32_t* and using the explicit integer-to-float conversion path, avoiding the incorrect pointer cast in the previous implementation.
Verified that the PR now applies cleanly on top of the current master branch.
The PR has been force-pushed after the rebase. Please take another look when convenient. Thanks!
Module
Type
Checklist
[Module:Type] Descriptionformat